places sidebar: Don't activate the bookmark if Eject was clicked
authorFederico Mena Quintero <federico@gnome.org>
Sat, 21 Sep 2013 02:13:31 +0000 (21:13 -0500)
committerFederico Mena Quintero <federico@gnome.org>
Sat, 21 Sep 2013 02:14:00 +0000 (21:14 -0500)
This should really fix https://bugzilla.gnome.org/show_bug.cgi?id=704087 ...

Signed-off-by: Federico Mena Quintero <federico@gnome.org>
gtk/gtkplacessidebar.c

index 1fadbf55689162a00fedd03590191139fbf5dcea..a019dcdde48087b1b34a8f8ee922274bdd0cdf42 100644 (file)
@@ -3265,18 +3265,13 @@ bookmarks_row_activated_cb (GtkWidget *widget,
                            GtkPlacesSidebar *sidebar)
 {
        GtkTreeIter iter;
-       GtkTreePath *clicked_path = NULL;
        GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
 
        if (!gtk_tree_model_get_iter (model, &iter, path)) {
                return;
        }
 
-       if (!clicked_eject_button (sidebar, &clicked_path)) {
-               open_selected_bookmark (sidebar, model, &iter, 0);
-       } else {
-               gtk_tree_path_free (clicked_path);
-       }
+       open_selected_bookmark (sidebar, model, &iter, 0);
 }
 
 static gboolean
@@ -3301,7 +3296,7 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
                eject_or_unmount_bookmark (sidebar, path);
                gtk_tree_path_free (path);
 
-               return FALSE;
+               return TRUE;
        }
 
        if (event->button == 1) {